Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 06:21:55 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 06:21:55 +0000 (22:21 -0800)
commitdbcb39c3fb159704f3a2e43f4128f1130934ea89
tree4a2dab7bafb837e70e121f8d32dae8383b6e2e76
parent27c59964cd5c5bdcd4de8a25cfb9ba2b267e14cd
parent0c703c467699c68f539749d2f8ce56179083ceeb
Merge from trunk.